Fix conflicting merge.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/tools/python/xen/xend/XendCheckpoint.py b/tools/python/xen/xend/XendCheckpoint.py
index 6e6e60156f92ea2adb2ab149c74afd344045b385..9250f71b6ca5f2fd228c51fc8bbd8130c4fa213a 100644 (file)
--- a/tools/python/xen/xend/XendCheckpoint.py
+++ b/tools/python/xen/xend/XendCheckpoint.py
@@ -142,7 +142,7 @@ def restore(xd, fd):
                 log.debug("IntroduceDomain %d %d %d %s",
                           dominfo.getDomid(),
                           store_mfn,
-                          dominfo.store_channel.port1,
+                          dominfo.store_channel,
                           dominfo.getDomainPath())
                 IntroduceDomain(dominfo.getDomid(),
                                 store_mfn,